x86: Switch to using pvops kernel by default for Linux

Keave ia64 on 2.6.18 since it currently has no dom0 support in pvops

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/buildconfigs/enable-xen-config b/buildconfigs/enable-xen-config
index 751b582c866d3fb66ed1cdc483de940dad781ed8..1e98684bde4f35bd7435d314106e24d899513b90 100644 (file)
--- a/buildconfigs/enable-xen-config
+++ b/buildconfigs/enable-xen-config
@@ -45,7 +45,8 @@ setopt CONFIG_HVC_XEN y
 setopt CONFIG_XEN_MAX_DOMAIN_MEMORY 32
 setopt CONFIG_XEN_DEBUG_FS y
 setopt CONFIG_XEN_DOM0 y
-
+setopt CONFIG_XEN_SYS_HYPERVISOR y
+setopt CONFIG_XEN_GNTDEV y
 setopt CONFIG_VMI y
 
 setopt CONFIG_KVM y
@@ -72,6 +73,9 @@ setopt CONFIG_DMAR n
 setopt CONFIG_INTR_REMAP n
 setopt CONFIG_GFS2_FS n
 setopt CONFIG_IOMMU_DEBUG n
+setopt CONFIG_X86_MCE_INTEL n
+setopt CONFIG_X86_MCE_AMD n
+setopt CONFIG_CRYPTO_AES_NI_INTEL n
 
 case ${XEN_TARGET_ARCH} in
     x86_32) setopt CONFIG_64BIT n ;;

diff --git a/config/Linux.mk b/config/Linux.mk
index 52c222799677f0a8f2036cfea8ebc9f872861140..7d9286d7f19086392a892c890c37a7aeeae256c0 100644 (file)
--- a/config/Linux.mk
+++ b/config/Linux.mk
@@ -1,7 +1,11 @@
 include $(XEN_ROOT)/config/StdGNU.mk
 
 # You may use wildcards, e.g. KERNELS=*2.6*
+ifeq (ia64,$(XEN_TARGET_ARCH))
 KERNELS ?= linux-2.6-xen
+else
+KERNELS ?= linux-2.6-pvops
+endif
 
 XKERNELS := $(foreach kernel, $(KERNELS), \
               $(patsubst buildconfigs/mk.%,%, \